Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Oct 2011 21:23:52 +0000 (14:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Oct 2011 21:23:52 +0000 (14:23 -0700)

Trivial merge